From 71cdd4de92b0884fb6f2b8ec0a913d0d4955bd7b Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Wed, 1 Oct 2014 19:37:10 +0000
Subject: [PATCH] system-coinmp

Gbp-Pq: Name system-coinmp.diff
---
 RepositoryExternal.mk |  15 +++++++++++++++
 config_host.mk.in     |   3 +++
 configure.ac          | Bin 465382 -> 465675 bytes
 3 files changed, 18 insertions(+)

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 8e8e0b708e5..176693ce08e 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2217,6 +2217,8 @@ endif # ENABLE_LPSOLVE
 
 ifneq ($(ENABLE_COINMP),)
 
+ifneq ($(SYSTEM_COINMP),TRUE)
+
 define gb_LinkTarget__use_coinmp
 $(call gb_LinkTarget_use_package,$(1),coinmp)
 ifeq ($(COM),MSC)
@@ -2245,6 +2247,19 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
 	coinmp \
 ))
 
+else # SYSTEM_COINMP
+
+define gb_LinkTarget__use_coinmp
+$(call gb_LinkTarget_set_include,$(1),\
+       $$(INCLUDE) \
+       $(COINMP_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(COINMP_LIBS))
+
+endef
+
+endif
+
 else
 
 gb_LinkTarget__use_coinmp :=
diff --git a/config_host.mk.in b/config_host.mk.in
index e97ecba252b..a1087beea1a 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -111,6 +111,9 @@ export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@
 export ENABLE_CHART_TESTS=@ENABLE_CHART_TESTS@
 export ENABLE_CMIS=@ENABLE_CMIS@
 export ENABLE_COINMP=@ENABLE_COINMP@
+export SYSTEM_COINMP=@SYSTEM_COINMP@
+export COINMP_CFLAGS=@COINMP_CFLAGS@
+export COINMP_LIBS=@COINMP_LIBS@
 export ENABLE_COLLADA=@ENABLE_COLLADA@
 export ENABLE_CRASHDUMP=@ENABLE_CRASHDUMP@
 export ENABLE_CUPS=@ENABLE_CUPS@
diff --git a/configure.ac b/configure.ac
index b9fd794cc1d7cd6c8031ee265d5b85264aba2aa5..f6607fab8cc921ed557fd1d1d4d62039f9b25dcd 100644
GIT binary patch
delta 219
zcmaF1S*ClN%!cTnlV$SdCLg%LGubI$h%2->RlzwwGtW0*^2f)TY{@`oZo%Y-*Y%p?
zezwQ`WCUU+AZFek_md^hV)~017BQ%z>9Jc_CD@$(J^g$Grq^s?mEwc2brc|mOy9bN
zRdc$$5i7^^rb0%Q=@<5}3j08mXmU9^#|MWx1&3$^M+S$u`o?33Lj>ZT-FzI~gOSuj
U#eF=Tg4<(_ShvR-v2{KN0ODItQvd(}

delta 125
zcmeC)Ci85w%!cTn&A)%P|NhAc#7scUy#4o2mO=}2Wrg63{L-8hh4NH|<c!qhY=yM^
zB8B40;*!){1?T+CJl_BXdj*gDa)pw7g_L}Sl8nR>1$(aPjW?KO*qr@6{d@zaKjdbS
Wn*L!gs{~Y_y~&t$dy_F+=W_tx<T85z

-- 
2.30.2